Don't call QueryVariableInfo() on EFI 1.10 machines #364
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The EFI 1.10 spec (and presumably earlier revisions as well) didn't have RT->QueryVariableInfo(), and on Chris Murphy's MacBookPro8,2 , that memory appears to be initialized randomly. This patch changes it to not call RT->QueryVariableInfo() if the EFI_RUNTIME_SERVICES table's major revision is less than two, and assumes our maximum variable size is 1024 in that case. Signed-off-by: Peter Jones <pjones@redhat.com>
martinezjavier
approved these changes
Apr 15, 2021
|
This fixed boot on MacBookAir 5,2 , too. |
jsetje
approved these changes
Apr 20, 2021
9 tasks
9 tasks
|
Looks good to me, tested locally on an Imac6,1. It's broken without this patch, and boots to grub fine after applying it. |
9 tasks
9 tasks
9 tasks
9 tasks
9 tasks
|
I have the same issue on a MacBookPro15,2 with EFI version 2.40. The shim gets stuck at I created a shim with verbose mode enabled, and these are the logs: sbat.c:553:set_sbat_uefi_variable() shim SBAT reparse before application
sbat.c:339:parse_sbat_var() SBAT variable entries:
sbat.c:344:parse_sbat_var() sbat, 1, 2021030218
pe.c:376:verify_sbat_section() SBAT section data
pe.c:378:verify_sbat_section() sbat, 1, SBAT Version, sbat, 1, https://github.co m/rhboot/shim/blob/main/SBAT.md
pe.c:378:verify_sbat_section() shim, 4, UEFI shim, shim, 1, https://github.com/rhboot/shim
pe.c:378:verify_sbat_section() shim.certus, 1, Certus Software S.R.L., shim, 15.8, mail:security@certussoftware.ro
sbat.c:138:verify_single_entry() component sbat has a matching SBAT variable entry, verifying
sbat.c:204:verify_sbat_helper() finished verifying SBAT data: Success
sbat.c:573:set_sbat_uefi_variable() SbatLevel variable is 18 bytes, attributes are 0x00000003
sbat.c:575:set_sbat_uefi_variable() Deleting SbatLevel variable.
sbat.c:609:set_sbat_uefi_variable() SbatLevel variable initialization succeeded
..... (unable to understand what is printing here check the video)
variables.c:28:fill_esl() fill_esl: first_sig-0x0, data_len=2022
mok.c:586:mirror_one_mok_variable() FullDataSize:2050 FullData:0x0
mok.c:622:mirror_one_mok_variable() v->name: "MokList" v-rtname: "MokListRT"
mok.c:623:mirror_one_mok_variable() v->data_size:0 v->data: 0x0
mok.c:624:mirror_one_mok_variable() FullDataSize:2050 FullData:0x0
mok.c:650:mirror_one_mok_variable() FullDataSize:2050 FullData:0x0 allocating FullData
mok.c:670:mirror_one_mok_variable() FullDataSize:2050 FullData:0x7650B018 p:0x7650B018 pos:0
variables.c:28:fill_esl() fill_esl: first_sig-0x7650A018, data_len=2022
mok.c:699:mirror_one_mok_variable() FullDataSize:2050 FullData:0x7650B018 p:0x7650B81A pos: 2050
mok.c:712:mirror_one_mok_variable() FullDataSize:2050 FullData:0x7650B018 p:0x7650B81A pos:2050
mok.c:740:mirror_one_mok_variable() FullDataSize:2050 FullData:0x7650B018 p:0x7650B81A pos:2050
mok.c:746:mirror_one_mok_variable() FullDataSize:2050 FullData:0x7650B018 p:0x7650B81A pos:2050
mok.c:769:mirror_one_mok_variable() FullDataSize:2050 FullData:0x7650B018 p:0x7650B81A pos:2050
mok.c:772:mirror_one_mok variable() calling mirror_mok_db("MokListRT", datasz=2050)
mok.c:228:get_max_var_sz() -> EFI 2.40 attrs: 6 #added by me.
mok.c:236:get_max_var_sz() calling RT->QueryVariableInfoO at 0x88C466D6IMG_4971.mov |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The EFI 1.10 spec (and presumably earlier revisions as well) didn't have
RT->QueryVariableInfo(), and on Chris Murphy's MacBookPro8,2 , that
memory appears to be initialized randomly.
This patch changes it to not call RT->QueryVariableInfo() if the
EFI_RUNTIME_SERVICES table's major revision is less than two, and
assumes our maximum variable size is 1024 in that case.
Signed-off-by: Peter Jones pjones@redhat.com